From f83af03579cbdb4b85e86c6cedee7578566fe802 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 25 May 2013 13:17:57 -0400 Subject: [PATCH] Avoid shadowing a variable I don't think this broke anything, but it is just inviting confusion. --- gtk/gtkwindow.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 4a4e1f3031..6970c7db32 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8755,19 +8755,19 @@ gtk_window_compute_hints (GtkWindow *window, * +-----------+ */ #define TEMPORARY_SIZE 10000 /* 10,000 pixels should be bigger than real widget sizes */ - GtkRequisition requisition; + GtkRequisition req; int current_width, current_height; _gtk_widget_override_size_request (geometry_info->widget, TEMPORARY_SIZE, TEMPORARY_SIZE, ¤t_width, ¤t_height); gtk_widget_get_preferred_size (widget, - &requisition, NULL); + &req, NULL); _gtk_widget_restore_size_request (geometry_info->widget, current_width, current_height); - extra_width = requisition.width - TEMPORARY_SIZE; - extra_height = requisition.height - TEMPORARY_SIZE; + extra_width = req.width - TEMPORARY_SIZE; + extra_height = req.height - TEMPORARY_SIZE; if (extra_width < 0 || extra_height < 0) { -- 2.30.2